From 3f1a65d6f5bfee7e0802dc40c7e845524a993430 Mon Sep 17 00:00:00 2001 From: Benjamin Otte Date: Wed, 5 Jan 2011 23:00:54 +0100 Subject: [PATCH] iconview: Use set_[hv]adjustment_values() also when just changing upper Simplifies the code quite a bit and the code is smart enough to not do extra work if only one value changes. --- gtk/gtkiconview.c | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/gtk/gtkiconview.c b/gtk/gtkiconview.c index 73b8b25655..cd1fa06914 100644 --- a/gtk/gtkiconview.c +++ b/gtk/gtkiconview.c @@ -2891,30 +2891,6 @@ gtk_icon_view_layout_single_row (GtkIconView *icon_view, return last_item; } -static void -gtk_icon_view_set_adjustment_upper (GtkAdjustment *adj, - gdouble upper) -{ - if (upper != adj->upper) - { - gdouble min = MAX (0.0, upper - adj->page_size); - gboolean value_changed = FALSE; - - adj->upper = upper; - - if (adj->value > min) - { - adj->value = min; - value_changed = TRUE; - } - - gtk_adjustment_changed (adj); - - if (value_changed) - gtk_adjustment_value_changed (adj); - } -} - static void gtk_icon_view_layout (GtkIconView *icon_view) { @@ -2983,10 +2959,8 @@ gtk_icon_view_layout (GtkIconView *icon_view) size_changed = TRUE; } - gtk_icon_view_set_adjustment_upper (icon_view->priv->hadjustment, - icon_view->priv->width); - gtk_icon_view_set_adjustment_upper (icon_view->priv->vadjustment, - icon_view->priv->height); + gtk_icon_view_set_hadjustment_values (icon_view); + gtk_icon_view_set_vadjustment_values (icon_view); if (size_changed) gtk_widget_queue_resize_no_redraw (widget); -- 2.30.2